commit ffe10cab55e406e84b3d63513cbacd6298def361
author Junio C Hamano <gitster@pobox.com> Thu Feb 04 00:44:23 2016
committer Junio C Hamano <gitster@pobox.com> Thu Feb 04 00:44:23 2016
tree fe2390c31f33c5abbd97830d7988f8e9c556330d
parent 19c2076a26be920feb8a661a79f40bae45a91e60

Autogenerated HTML docs for v2.7.0-297-g563e3 

git-ls-files.html

diff --git a/git-ls-files.html b/git-ls-files.html index 285bead..7c2b983 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -751,6 +751,7 @@  <pre class="content"><em>git ls-files</em> [-z] [-t] [-v]   (--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*   (-[c|d|o|i|s|u|k|m])*  + [--eol]   [-x &lt;pattern&gt;|--exclude=&lt;pattern&gt;]   [-X &lt;file&gt;|--exclude-from=&lt;file&gt;]   [--exclude-per-directory=&lt;file&gt;]  @@ -1070,6 +1071,26 @@  </p>   </dd>   <dt class="hdlist1">  +--eol  +</dt>  +<dd>  +<p>  + Show &lt;eolinfo&gt; and &lt;eolattr&gt; of files.  + &lt;eolinfo&gt; is the file content identification used by Git when  + the "text" attribute is "auto" (or not set and core.autocrlf is not false).  + &lt;eolinfo&gt; is either "-text", "none", "lf", "crlf", "mixed" or "".  +</p>  +<div class="paragraph"><p>"" means the file is not a regular file, it is not in the index or  +not accessable in the working tree.</p></div>  +<div class="paragraph"><p>&lt;eolattr&gt; is the attribute that is used when checking out or committing,  +it is either "", "-text", "text", "text=auto", "text eol=lf", "text eol=crlf".  +Note: Currently Git does not support "text=auto eol=lf" or "text=auto eol=crlf",  +that may change in the future.</p></div>  +<div class="paragraph"><p>Both the &lt;eolinfo&gt; in the index ("i/&lt;eolinfo&gt;")  +and in the working tree ("w/&lt;eolinfo&gt;") are shown for regular files,  +followed by the ("attr/&lt;eolattr&gt;").</p></div>  +</dd>  +<dt class="hdlist1">   --   </dt>   <dd>  @@ -1098,6 +1119,8 @@  <div class="content">   <pre><code>[&lt;tag&gt; ]&lt;mode&gt; &lt;object&gt; &lt;stage&gt; &lt;file&gt;</code></pre>   </div></div>  +<div class="paragraph"><p><em>git ls-files --eol</em> will show  + i/&lt;eolinfo&gt;&lt;SPACES&gt;w/&lt;eolinfo&gt;&lt;SPACES&gt;attr/&lt;eolattr&gt;&lt;SPACE*&gt;&lt;TAB&gt;&lt;file&gt;</p></div>   <div class="paragraph"><p><em>git ls-files --unmerged</em> and <em>git ls-files --stage</em> can be used to examine   detailed information on unmerged paths.</p></div>   <div class="paragraph"><p>For an unmerged path, instead of recording a single mode/SHA-1 pair,  @@ -1166,7 +1189,7 @@  <div id="footnotes"><hr /></div>   <div id="footer">   <div id="footer-text">  -Last updated 2014-06-06 12:15:38 PDT  +Last updated 2016-02-03 16:43:50 PST   </div>   </div>   </body>